Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.

Integration 20120828#263

Closed
zhizhangchen wants to merge 52 commits into
intel:masterfrom
zhizhangchen:integration-20120828
Closed

Integration 20120828#263
zhizhangchen wants to merge 52 commits into
intel:masterfrom
zhizhangchen:integration-20120828

Conversation

@zhizhangchen

Copy link
Copy Markdown
Contributor

#253, #262, #226, #261, #252, #259, #257, #249, #256, #243, #196, #222 included

Xuqing Kuang and others added 30 commits August 24, 2012 14:57
For force generate ID property for event handler.
Completed:
1. Event handler dialog construct
2. JS code exporting.
3. JS Preview.
Vertical ButtonGroup appears as haux-horizontal in Footer
We can define a "morph" function for a zone so that When adding
a child, it can be morphed to another type. With this feature, we
can have a generic widget in the palette which can adapt
to different types of containers when dropped on them.
Looking for parent zone with the same name. If found, extend it
with descendant zone, otherwize add a new zone.
Also set the default value of count bubble to empty, i.e, no count
bubble
Sorting is still OK without this change and it causes bad
appearance of ButtonGroup and ThumbnailSplitList
Previous algorithm only supports one zone containers or Headers,
and it works hard to determine the position for insertion. The new
algorithm firstly tries to insert to the zone of the nearest
sibling using enhenced insertChildAfter/Before, if fails, uses
addChild to automatically find a zone to insert.
zhizhangchen and others added 18 commits August 28, 2012 14:38
* modify parser function to support minified theme
* refactor uploadTheme function: add a handler to update items
  in project dialog when upload finished
* add a new property allThemes to record all themes
* refactor uploadTheme function
* also clean up some spaces in deflate.js file
…nto integration-20120828

Conflicts:
	src/js/widgets.js
…20120828

Conflicts:
	src/js/views/property.js
@grgustaf

Copy link
Copy Markdown
Contributor

Took about half of them, comments on the other half. Thanks!

@zhizhangchen

Copy link
Copy Markdown
Contributor Author

Replaced by #267

@zhizhangchen

Copy link
Copy Markdown
Contributor Author

closed

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants